Replace `iff' in doc-strings and comments.

diff --git a/lisp/textmodes/artist.el b/lisp/textmodes/artist.el
index dbb41f13ec07d9cf6b9e095e135fb91acdc6c654..274de28e6a05a95867bd946d1b70ae742463c442 100644 (file)
--- a/lisp/textmodes/artist.el
+++ b/lisp/textmodes/artist.el
@@ -1768,7 +1768,7 @@ info-variant-part."
 ;; Macro that won't funcall the function if it is nil.
 ;;
 (defmacro artist-funcall (fn &rest args)
-  "Call function FN with ARGS iff FN is not nil."
+  "Call function FN with ARGS, if FN is not nil."
   (list 'if fn (cons 'funcall (cons fn args))))
 
 (defun artist-uniq (l)

diff --git a/lisp/textmodes/flyspell.el b/lisp/textmodes/flyspell.el
index 8b95a159477358a7567cfe92fa4788c8fb3b6f82..0b5dfa4cc54ba30fc93648de75a6e926a615a470 100644 (file)
--- a/lisp/textmodes/flyspell.el
+++ b/lisp/textmodes/flyspell.el
@@ -457,7 +457,8 @@ See also `flyspell-duplicate-distance'."
 This spawns a single Ispell process and checks each word.
 The default flyspell behavior is to highlight incorrect words.
 With no argument, this command toggles Flyspell mode.
-With a prefix argument ARG, turn Flyspell minor mode on iff ARG is positive.
+With a prefix argument ARG, turn Flyspell minor mode on if ARG is positive,
+otherwise turn it off.
 
 Bindings:
 \\[ispell-word]: correct words (using Ispell).
@@ -1621,7 +1622,7 @@ FLYSPELL-BUFFER."
 ;;*    flyspell-overlay-p ...                                           */
 ;;*---------------------------------------------------------------------*/
 (defun flyspell-overlay-p (o)
-  "A predicate that return true iff O is an overlay used by flyspell."
+  "Return true if O is an overlay used by flyspell."
   (and (overlayp o) (overlay-get o 'flyspell-overlay)))
 
 ;;*---------------------------------------------------------------------*/

diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el
index 047fb1413319e025bcd15ea401191285e69c3bbd..3d6a17c5d9334918114efa0577098af8bf5b9d57 100644 (file)
--- a/lisp/textmodes/ispell.el
+++ b/lisp/textmodes/ispell.el
@@ -3324,7 +3324,8 @@ available on the net."
 ;;;###autoload
 (defun ispell-minor-mode (&optional arg)
   "Toggle Ispell minor mode.
-With prefix arg, turn Ispell minor mode on iff arg is positive.
+With prefix argument ARG, turn Ispell minor mode on if ARG is positive,
+otherwise turn it off.
 
 In Ispell minor mode, pressing SPC or RET
 warns you if the previous word is incorrectly spelled.

diff --git a/lisp/textmodes/nroff-mode.el b/lisp/textmodes/nroff-mode.el
index a96d48458573f3c2f62cd704d618b7b411081990..18156071e1cbd2e7476be1ea6d4ce8199f184031 100644 (file)
--- a/lisp/textmodes/nroff-mode.el
+++ b/lisp/textmodes/nroff-mode.el
@@ -261,7 +261,7 @@ automatically inserts the matching closing request after point."
 `nroff-electric-newline' forces Emacs to check for an nroff request at the
 beginning of the line, and insert the matching closing request if necessary.
 This command toggles that mode (off->on, on->off), with an argument,
-turns it on iff arg is positive, otherwise off."
+turns it on if arg is positive, otherwise off."
   :lighter " Electric"
   (or (derived-mode-p 'nroff-mode) (error "Must be in nroff mode")))
 

diff --git a/lisp/textmodes/refill.el b/lisp/textmodes/refill.el
index a20a482a1c9580f3d9c2352ec4109916483c03ea..3717faa8ad28b5caeb95da6b596529c3bf1e528c 100644 (file)
--- a/lisp/textmodes/refill.el
+++ b/lisp/textmodes/refill.el
@@ -217,7 +217,7 @@ complex processing.")
 ;;;###autoload
 (define-minor-mode refill-mode
   "Toggle Refill minor mode.
-With prefix arg, turn Refill mode on iff arg is positive.
+With prefix arg, turn Refill mode on if arg is positive, otherwise turn it off.
 
 When Refill mode is on, the current paragraph will be formatted when
 changes are made within it.  Self-inserting characters only cause

diff --git a/lisp/textmodes/reftex-global.el b/lisp/textmodes/reftex-global.el
index c551083240c799b14a31cb877367589e76aa3953..2a39949431c0f4a89f8b2856d57d4645a6bf2223 100644 (file)
--- a/lisp/textmodes/reftex-global.el
+++ b/lisp/textmodes/reftex-global.el
@@ -431,7 +431,7 @@ the current TeX document.
 
 With no argument, this command toggles
 `reftex-isearch-minor-mode'.  With a prefix argument ARG, turn
-`reftex-isearch-minor-mode' on iff ARG is positive."
+`reftex-isearch-minor-mode' on if ARG is positive, otherwise turn it off."
   (interactive "P")
   (let ((old-reftex-isearch-minor-mode reftex-isearch-minor-mode))
     (setq reftex-isearch-minor-mode 

diff --git a/lisp/textmodes/sgml-mode.el b/lisp/textmodes/sgml-mode.el
index 1c81a1e7028c0d82a5d317f3fa6db51518153f7b..9da49fcc59929f1f3042de58f03b468689c50ecd 100644 (file)
--- a/lisp/textmodes/sgml-mode.el
+++ b/lisp/textmodes/sgml-mode.el
@@ -757,7 +757,7 @@ With prefix argument ARG, repeat this ARG times."
 (defun sgml-skip-tag-forward (arg)
   "Skip to end of tag or matching closing tag if present.
 With prefix argument ARG, repeat this ARG times.
-Return t iff after a closing tag."
+Return t if after a closing tag."
   (interactive "p")
   ;; FIXME: Use sgml-get-context or something similar.
   ;; It currently might jump to an unrelated </P> if the <P>

diff --git a/lisp/textmodes/two-column.el b/lisp/textmodes/two-column.el
index eebd1923b637785022ed0cd17d48dd94ade0c706..e1f55c0dece3799352f1a8b9c1528960e6d8c390 100644 (file)
--- a/lisp/textmodes/two-column.el
+++ b/lisp/textmodes/two-column.el
@@ -561,8 +561,10 @@ off trailing spaces with \\[delete-trailing-whitespace]."
   (newline arg))
 
 (defun 2C-toggle-autoscroll (arg)
-  "Toggle autoscrolling, or set it iff prefix ARG is non-nil and positive.
-When autoscrolling is turned on, this also realigns the two buffers."
+  "Toggle autoscrolling.
+With prefix argument ARG, turn on autoscrolling if ARG is
+positive, otherwise turn it off.  When autoscrolling is turned
+on, this also realigns the two buffers."
   (interactive "P")
   ;(sit-for 0)
   (setq 2C-autoscroll-start (window-start))